From aa4eca06c488a53c9aa939d79e484f6a297767df Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 29 Oct 2008 12:04:38 +0000 Subject: [PATCH] minios: Define __INSIDE_MINIOS__ rather than __MINIOS__ Signed-off-by: Ian Jackson --- extras/mini-os/Makefile | 3 --- extras/mini-os/include/sched.h | 2 +- extras/mini-os/minios.mk | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/mini-os/Makefile b/extras/mini-os/Makefile index 7d57086c53..ec24cba14a 100644 --- a/extras/mini-os/Makefile +++ b/extras/mini-os/Makefile @@ -18,9 +18,6 @@ include minios.mk # Set tester flags # CFLAGS += -DBLKTEST_WRITE -# Make the headers define our internal stuff -CFLAGS += -D__MINIOS__ - # Define some default flags for linking. LDLIBS := APP_LDLIBS := diff --git a/extras/mini-os/include/sched.h b/extras/mini-os/include/sched.h index 62dc4a93c6..c60e61e94a 100644 --- a/extras/mini-os/include/sched.h +++ b/extras/mini-os/include/sched.h @@ -48,7 +48,7 @@ struct thread* create_thread(char *name, void (*function)(void *), void *data); void exit_thread(void) __attribute__((noreturn)); void schedule(void); -#ifdef __MINIOS__ +#ifdef __INSIDE_MINIOS__ #define current get_current() #endif diff --git a/extras/mini-os/minios.mk b/extras/mini-os/minios.mk index 7ee19b3a86..698648a904 100644 --- a/extras/mini-os/minios.mk +++ b/extras/mini-os/minios.mk @@ -26,6 +26,9 @@ else DEF_CFLAGS += -O3 endif +# Make the headers define our internal stuff +DEF_CFLAGS += -D__INSIDE_MINIOS__ + # Build the CFLAGS and ASFLAGS for compiling and assembling. # DEF_... flags are the common mini-os flags, # ARCH_... flags may be defined in arch/$(TARGET_ARCH_FAM/rules.mk -- 2.30.2